From: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
Date: Thu, 7 Jan 2021 12:08:42 +0000 (+0000)
Subject: storage-mode-concat
X-Git-Tag: archive/raspbian/10.0.0+r36-3+rpi1~12^2~9
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=eddf789b244246cec77b4409e6b52104139f7083;p=android-platform-art.git

storage-mode-concat


Gbp-Pq: Name storage-mode-concat.patch
---

diff --git a/runtime/image.cc b/runtime/image.cc
index b6bb0b1..a7ad374 100644
--- a/runtime/image.cc
+++ b/runtime/image.cc
@@ -172,7 +172,7 @@ bool ImageHeader::Block::Decompress(uint8_t* out_ptr,
     }
     default: {
       if (error_msg != nullptr) {
-        *error_msg = (std::ostringstream() << "Invalid image format " << storage_mode_).str();
+        *error_msg = "Invalid image format " + storage_mode_;
       }
       return false;
     }